Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 17 Jul 2011 01:03:12 +0000 (18:03 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 17 Jul 2011 01:03:12 +0000 (18:03 -0700)

Trivial merge